Merge from trunk
authorJason Rumney <jasonr@gnu.org>
Thu, 7 Jan 2010 13:53:57 +0000 (21:53 +0800)
committerJason Rumney <jasonr@gnu.org>
Thu, 7 Jan 2010 13:53:57 +0000 (21:53 +0800)
commit05d25919eafa95a2909d8e2565d01b0dbc207b30
tree8948dc746766d45c5f2e9c8f3fd9368797bf33e9
parent50d3c7295a19d748da5531fb2ffdae739e8b1232
parent438d470ff7897fc60748be82fe06bffe12eb617f
Merge from trunk